From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 20 Jul 2007 11:14:40 +0000 (+0000)
Subject: (install-lisp-CMD, install-lisp-SH): Don't create subdirectories
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~17799
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=86b2f4ec848d8144807e9e9fba312a25b09a72eb;p=emacs.git

(install-lisp-CMD, install-lisp-SH): Don't create subdirectories
in $(INSTALL_DIR)/lisp/ if they already exist.
---

diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 0b666d941e5..55b9f9ed5e2 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -429,12 +429,13 @@ install:
 # since cp does not preserve time stamps
 install-lisp-SH:
 	cp -f *.el "$(INSTALL_DIR)/lisp"
-	for dir in $(WINS); do mkdir "$(INSTALL_DIR)/lisp/$$dir" && cp -f $$dir/*.el "$(INSTALL_DIR)/lisp/$$dir"; done
+	for dir in $(WINS); do [ -d "$(INSTALL_DIR)/lisp/$$dir" ] || mkdir "$(INSTALL_DIR)/lisp/$$dir"; done
+	for dir in $(WINS); do cp -f $$dir/*.el "$(INSTALL_DIR)/lisp/$$dir"; done
 	for dir in . $(WINS); do cp $$dir/*.elc "$(INSTALL_DIR)/lisp/$$dir"; done
 
 install-lisp-CMD:
 	cp -f *.el "$(INSTALL_DIR)/lisp"
-	for %%f in ($(WINS)) do mkdir "$(INSTALL_DIR)/lisp/%%f"
+	for %%f in ($(WINS)) do if not exist "$(INSTALL_DIR)/lisp/%%f" mkdir "$(INSTALL_DIR)/lisp/%%f"
 	for %%f in ($(WINS)) do cp -f %%f/*.el "$(INSTALL_DIR)/lisp/%%f"
 	for %%f in (. $(WINS)) do cp -f %%f/*.elc "$(INSTALL_DIR)/lisp/%%f"